projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 361f1b8)
fix(mac): bump deployment target to 12.0
authorJyrki Gadinger <nilsding@nilsding.org>
Fri, 4 Apr 2025 09:06:32 +0000 (11:06 +0200)
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>
Fri, 4 Apr 2025 11:48:44 +0000 (11:48 +0000)
Qt 6.8 now requires macOS 12.0 as per https://doc.qt.io/qt-6.8/macos.html

for comparison, Qt 6.7 supported 11.0 and newer: https://doc.qt.io/qt-6.7/macos.html

also update the Packages project to refuse to install on anything older
than Monterey (12.0)

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
CMakeLists.txt patch | blob | history
admin/osx/macosx.pkgproj.cmake patch | blob | history
cmake/modules/MacOSXBundleInfo.plist.in patch | blob | history
craftmaster.ini patch | blob | history
shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj patch | blob | history

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b7448b2e3625bc56dea5d6de1663c500eda1254..140ffa8ec376e346d58fba4bab89962bf38ef56a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy(SET CMP0071 NEW) # Enable use of QtQuick compiler/generated code
 project(client)
 
 if(APPLE)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum OSX deployment version")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0" CACHE STRING "Minimum OSX deployment version")
 endif()
 
 set(CMAKE_CXX_STANDARD 17)
diff --git a/admin/osx/macosx.pkgproj.cmake b/admin/osx/macosx.pkgproj.cmake
index 401326e39f6c7811d403c0de18629dd532f53271..dc906aaddaef6dc1e8e0a7a6ac92d20c6daa6309 100644 (file)
--- a/admin/osx/macosx.pkgproj.cmake
+++ b/admin/osx/macosx.pkgproj.cmake
@@ -687,6 +687,31 @@
                        <dict/>
                        <key>PREINSTALL_PATH</key>
                        <dict/>
+                       <array>
+                               <dict>
+                                       <key>BEHAVIOR</key>
+                                       <integer>3</integer>
+                                       <key>DICTIONARY</key>
+                                       <dict>
+                                               <key>IC_REQUIREMENT_OS_DISK_TYPE</key>
+                                               <integer>0</integer>
+                                               <key>IC_REQUIREMENT_OS_DISTRIBUTION_TYPE</key>
+                                               <integer>0</integer>
+                                               <key>IC_REQUIREMENT_OS_MINIMUM_VERSION</key>
+                                               <integer>120000</integer>
+                                       </dict>
+                                       <key>IC_REQUIREMENT_CHECK_TYPE</key>
+                                       <integer>1</integer>
+                                       <key>IDENTIFIER</key>
+                                       <string>fr.whitebox.Packages.requirement.os</string>
+                                       <key>MESSAGE</key>
+                                       <array/>
+                                       <key>NAME</key>
+                                       <string>Operating System</string>
+                                       <key>STATE</key>
+                                       <true/>
+                               </dict>
+                       </array>
                        <key>RESOURCES</key>
                        <array/>
                        <key>ROOT_VOLUME_ONLY</key>
diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in
index 5705f344d6c2260594fc9cff9f4492d0b153b1ff..7e996b4b7c009b6ebb5b048e097092f5430c4ec5 100644 (file)
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -5,7 +5,7 @@
         <key>NSPrincipalClass</key>
         <string>NSApplication</string>
         <key>LSMinimumSystemVersion</key>
-        <string>11.0</string>
+        <string>12.0</string>
         <key>LSUIElement</key>
         <true/>
         <key>CFBundleDevelopmentRegion</key>
diff --git a/craftmaster.ini b/craftmaster.ini
index 0164916d91afa15a82fa7b30b303b7e01bc41cd2..f9c25ade4beca33241baff471ecd6666ec69add6 100644 (file)
--- a/craftmaster.ini
+++ b/craftmaster.ini
@@ -15,7 +15,7 @@ CreateCache = False
 # Category is case sensitive
 [GeneralSettings]
 
-General/MacDeploymentTarget = 11.0
+General/MacDeploymentTarget = 12.0
 
 Compile/BuildType = RelWithDebInfo
 
diff --git a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj
index f41132680d32c5b7bc29260fe2fee70ea921b4a7..60794b7aeb66ecdfab7f1240cb859aa81b224331 100644 (file)
--- a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj
+++ b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj
@@ -829,7 +829,7 @@
                                        "@executable_path/../Frameworks",
                                        "@executable_path/../../../../Frameworks",
                                );
-                               MACOSX_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 12.0;
                                MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
                                MTL_FAST_MATH = YES;
                                ONLY_ACTIVE_ARCH = YES;
@@ -881,7 +881,7 @@
                                        "@executable_path/../Frameworks",
                                        "@executable_path/../../../../Frameworks",
                                );
-                               MACOSX_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 12.0;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_FAST_MATH = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "$(OC_APPLICATION_REV_DOMAIN).$(PRODUCT_NAME)";
@@ -942,7 +942,7 @@
                                        "@executable_path/../Frameworks",
                                        "@loader_path/Frameworks",
                                );
-                               MACOSX_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 12.0;
                                MARKETING_VERSION = 1.0;
                                MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
                                MTL_FAST_MATH = YES;
@@ -1004,7 +1004,7 @@
                                        "@executable_path/../Frameworks",
                                        "@loader_path/Frameworks",
                                );
-                               MACOSX_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 12.0;
                                MARKETING_VERSION = 1.0;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_FAST_MATH = YES;
@@ -1067,7 +1067,7 @@
                                        "@executable_path/../../Frameworks",
                                );
                                LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 12.0;
                                MARKETING_VERSION = 1.0;
                                MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
                                MTL_FAST_MATH = YES;
@@ -1127,7 +1127,7 @@
                                        "@executable_path/../../Frameworks",
                                );
                                LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 12.0;
                                MARKETING_VERSION = 1.0;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_FAST_MATH = YES;
@@ -1259,7 +1259,7 @@
                                        "$(inherited)",
                                        "@executable_path/../Frameworks",
                                );
-                               MACOSX_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 12.0;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1310,7 +1310,7 @@
                                        "$(inherited)",
                                        "@executable_path/../Frameworks",
                                );
-                               MACOSX_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 12.0;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PROVISIONING_PROFILE = "";
@@ -1365,7 +1365,7 @@
                                        "@executable_path/../Frameworks",
                                        "@executable_path/../../../../Frameworks",
                                );
-                               MACOSX_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 12.0;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                OC_APPLICATION_NAME = ownCloud;
                                OC_APPLICATION_REV_DOMAIN = com.owncloud.desktopclient;
@@ -1419,7 +1419,7 @@
                                        "@executable_path/../Frameworks",
                                        "@executable_path/../../../../Frameworks",
                                );
-                               MACOSX_DEPLOYMENT_TARGET = 11.0;
+                               MACOSX_DEPLOYMENT_TARGET = 12.0;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OC_APPLICATION_NAME = ownCloud;
                                OC_APPLICATION_REV_DOMAIN = com.owncloud.desktopclient;
Unnamed repository; edit this file 'description' to name the repository.